Recap

Version control with Git

Git is a distributed version control system

Get a repo from a remote

Get a repo from a remote

By cloning, you get a full copy of the repository on your machine.

Get changes from the remote

• Local changes, publish to remote: git push

• Remote changes, pull to local: git pull

A simple collaboration workflow

• One remote repo on Github, multiple local repos
• Idea: Everyone works on the same branch
  • Pull before you start working
  • Push after you finished working

A simple collaboration workflow

This works well if

• Repo is not updated often
• You don’t work on the same files simultaneously
• No need to discuss changes
  • Everything is directly integrated in main
• You collaborate with yourself

A simple collaboration workflow

This workflow starts to be problematic when

• People push often
  • Conflicts on main
• Not possible to discuss code before integration
• Difficult to just “try something out”
  • Everything goes directly to main

A branching-merging workflow

• One remote repo on Github, multiple local repos
• Idea: Everyone works on the their separate branch
  • Merge your branch with the main when you are finished

A branching-merging workflow

Advantages of this approach

• Guarantee that main always works
• Potential conflicts don’t have to be solved on main

Working on a separate branch

The steps to create and work on a separate branch are easy:

• Create a local branch and switch to it
• Work on the branch like you are used to
  • Make changes, stage and commit, publish and push

Merging changes from a branch

To bring changes to the main branch you need to merge them.

Normally: Git merge brings the commits from the branch to main

Merging changes from a branch

To bring changes to the main branch you need to merge them.

If there was a commit on a common file in main, a merge commit is introduced.

Merging changes from a branch

To bring changes to the main branch you need to merge them.